Modification for Policy Part