Yes, Batman1, your code meets all current requirements. In current situation, my "improvent" is actually a deterioration. But I tried to be helpful!