updated for setting working dir