updated to gap v1.2