hacks to get prototype demo working