18 commits to catch up nolan's branch