renaming conventions, added drop function