Tweaks to make this actually work