updating, with earisu's