Improved Drunk mode