Collapse some stuff to make things simpler