maybe fixed the z scaling
merged