Added Edit()
Reformatted