added repeat and surround