Improved samples. Sound is better. TODO remove duplicated triggerings