move towards mode centric workflow