Now includes tmp dir