new changes with the basic flow