changes from adunofair's decls in wrapper xml