Updated for cleaner paths