Added the final commits from peacekeeper_unni