more changes

changes
Merge remote-tracking branch 'origin/edit' into Voce-Dev