Move appropriate code to udt pre-game