integrate changes

changes look good