new features and work in progress