Fixing Y - kinda... this thing is hard