new version
removed hard coded path