Added new toggle and new infinity behavior