Update controllers [DO NOT MERGE YET]