Added Edit to Methods
resolved some merging issues