List upgrade; Flow logic change