StationaryGraphic refactored completely