refactor - prepare for fast games