Wrapping in UMD header manually (not happy)