Better handling for updating grant - 2