Agreed, modified the proposed solution.