Changes to Space and Board code