         lineWidthScalingFactor = toSize.width / highestX
     }
     else {
-        xScalingFactor = xScalingFactor * (CGFloat(1) / ratio)
+        xScalingFactor = (CGFloat(1.0) / highestX) * (toSize.width * ratio)
         
         let newX = highestX * xScalingFactor
         offset = (toSize.width - newX) / CGFloat(2)

    var offset: CGFloat!
    
    if fullHorizontal {
        yScalingFactor = yScalingFactor * (CGFloat(1) / ratio)
        
        let newY = highestY * yScalingFactor
        offset = (toSize.height - newY) / CGFloat(2)

    //// www.paintcodeapp.com
    
    //// Color Declarations
    let color = color
    
    //// Oval Drawing
    var ovalPath = UIBezierPath(ovalInRect: CGRectMake(0 * xScalingFactor, 0 * yScalingFactor, 40 * xScalingFactor, 40 * yScalingFactor))
