js changes
final gmae changes