More controller edits