Major optimization fix for drawing boards