merge changes from Bruno