Reorganizing the before and after