Modifications to make the path work