re-added repeat and surround (not sure what happened)