replaced some hacky calendar stuff