added weekend / weekday factor