Added support for high and low grades