changed for new directory environments