seems to be working again, with filtering
Merge branch 'new_dpph' into develop