Complet rewrite of collapse block