Added z scaling
test