Let me throw a counter-proposal at you and see if it satisfies your need here. We can get into why I think those two have to stay how they are after