trying to stop stalling
Changed initial board
merge conflicts