Fix:Core:Merged drawing routines