Improved Expiry Check!