Fixed API, fixed grade page