Calculate y properly.

3 files changed