Revamped to be ready for 4 by 4 board