made more demo friendly