adding some new features