moved expire to upper level