Refocatored the board