modifying for 3.3
reverting
changed for new directory environments