Forgot to remove Z completely