After JoJac's cleanup - 2