hacks to make it work, logs to show more info