Add in FVT and update scenario 2