Tweaking definitions further