included scaling around scale center
solved merge conflicts