expiration working better... simpler code