M5 updates for samples