woops - don't remove activatedFountain from list
Merge branch 'develop'