Adding work fine, need to refine the loading when new grants are added