More gl calls converted