Tidied controller, bumped to latest version