final pass for nysci
possible disaster observer structure change about to start