new features, more testing