More local improving for iframe demo