Add temporary vs. permanent. Code improvement required.