Changed the gradu structure