New build system and salvage from redoedu