fixing up toggle part 1