Added trait names back in, now hopefully correct