GenerateController and PlayerController changes