added weekend check