Reverted the unnecessary 'in X days' check