A lot of refactoring, 'yesterday' date