Improved demo design