2 new modes + samples