Additional changes in unity, see last commit