added user expiry checks/ future planning