Altered the date calculation because I'm an idiot