Added custom toggle features