Moved drop to function