Reverted hours "fix" (was not a bug)
Adjusted threshold expiration