Tweaks to working!