More work on StraightEdge integration