Simplified working dir, again.