Minor change to how the controllers are polled, this will hopefully be quicker using the hashmap better