integration of kaku protocol changes 2