Modified to include IPD