Added most of work for i=2 case