changes in master use -m -a