Added dir(), tweaked 'in' to work better