some changes
g