More logical/correct FM macro workflow...