added drop and altered names to work properly