prepare per 2.0
some path modification