merge fix1
merge fix2
merge fix3