Improved one-shot