integrated changes for board building code, which works correctly now