updated references to drop_off fields