some new changes regarding driver flow has been added