Adding back-to-live animation, changing some nomenclature