Third try

somehow, it change the functional behavior