doin gradeScript
Merge branch 'Freystar'