Tweaks to existing features!