Implementing some new features ...