Added toggle features