Commentary now working