Added weekend logic