Senate changes its mind, OKs modified 'cupcake bill'