it works, with a hack
minor tweaks