This can be deleted because of the new trait