Redesign of the drop functions