Dates still funky, but improving