basic hacks to get it working