Updates to make game more decoupled