Working on UpfrontIndex