added some new features