added support for both the toggle and mobile.