Improved OIT demo