Added checks for weekday and weekend