Reworked sample system, noticed possible performance drop.