Edits to controllers