updated to fix paths