Added toggle functionality