#4: fixing list flow