better pop fade
Update for latest crypton
merged from latest master