Adding temp directories and modifications