Added X and Y scaling --ADJ