working on some new features