tweaks to make it actually work