suppose i should bundle first