changed sql

combined and added drops.