made it work (almost)