Reworked tainting steps