Enhancement: adjust for cap3 style