Improved demo2