move builder actions to just after unpack