Edit changes

Undo refactoring where args have been changed