moar artifact handling