Started fixing GL