restructure; removed g_BBox