raw + marks attempt working except for empty surrounds