Tweaks to make it work