tweaks, now kind of works