regrouped some options