Added toggle flag