Problem 13, Problem 12 - date fix