Toash's changes