added features (see source file)