amended toggle behaviour