Added scale and translate