update expansion and build

update expansion and build