last commit for sol branch, will work with integrated master branch