Added new toggle flow