further improvement on hardcoded paths