Some optimizations to board