some changes
merged Gs changes