Controller edits