merge changes 11/25