fixed group classes and moved WOD