- use proper attr for expiration
- added "never expire" checks
- rel 5