Updated Board code