Finished up expiration logic