Added check for expire