New patch format, not complete yet