Still screwed up, but slightly less so...