More consistent tagging
Added A better way of typing