Tweaks to get it to work