changed it further at Yui's request