changed dir to corraspond to version 2