Fixed the edit problem & removed the create by statement