Updates for Tomoshibi