Revamped user choice logic