updated
Use attribute value where appropriate