Updates to get toggle button workign better.