Updated to work with CoGrOO 4