Changed dir arrang (again)