Working dir implementation without the changes