Final code changes before competition