Adding some new features...