Scale and Translate works
Fixed Merge errors