merged changes 2