added diameter support