fixes to drop to not take so long