yes, I agree with Viktor on this one, way cleaner