Rewrote attribute value building