Now takes notice of the pwd