Properly implemented start date calculation