Major changes-added new capabilities