little refactory in the drop mode support functions