One click mode improved