updates from Cole to Tokyo.lich