change paths to more robust