simplified for 2.0 path
2 files changed