Adding more changes to router flow