Preliminary controller revisions, amending functions