I added some new features