Updated grade plugin