Final commit before competition use