fine-tuned logic and added 'yesterday'