tweaks to make it work