Yet another rework.