actually redid dirs, whoops