We did a lot of stuff, added path checking