Adding repeat and surround