Extending the conditions for more cases for the weekly prompt calculation