added weekday/end checks