Added latest changes