mod gif logic
Merge branch 'ph9_dev' into ph9_review