Updated to use toggle