DONT MERGE Enhance simple grades