Moved drop check to Update.