Reworked samples, added partition.