Working on date focusing