added expiration stuff