Simplified collapser logic