renamed and converted to a Trait