Jhbate/changes for edit