Added gs and gap