New version with many features