Revert to older Shifty
Add Empathy