re-added pride
Merge branch 'logan'