Removed the need to have a static controller: