refactored board a little