adding Yoichi sets and WS's
adding toggle for snapshot modes