Update Expand function