rearrange some vars, remove word "ba"