Some changes to improve step-by-step expansion of muliple island case