Added some toggleability