First try to fix the delete stuff
Add initial port for gather post mod