Added whatif capability