Updated for 16x16 board