updated: router and new if/unless binders