Updated due to geoCPM inclusion