303/304 wrappers rewritted