Added proper double button logic;