Adapted to GPII-941