toggle working better