Updated to be compatible with GLI 2