add repeat and surround