Final modifications for the demo