Drop while drop and other changes