o.1, o.2.1, o.2.2 add shuffle per Matt