changes in new from mastre branch