updated to reflect current state
removed hard path
Merge branch 'dev'