(bug) added back satokos work lost in last merge conflict