improving native demo state