Tweaks to get it working again
Tests passing