Improved: more consistent