change paths and add some new features