moving straw generation to core