80% added new functionality