changes to support master branch correctly.