merged mauro's updates