collapse some
another untested update