Add part of rewrited version