be more directory aware