Collapse update

@gregcaporaso, can you review when you have a chance?