Added basic path
Small improvements
Fixed conflict
Fixed conflicts