regrouped some of my macro lines