Added latest changes from js