No, it doesn't look good, I'm going to revert this change