Made GL2-friendly