Added npd for now