new features (need to test and document)