couple of things were destroyed at some point, re-editing