updates for new classes and experiment