tweaks to get it working