Reordering and semantics changes complete. Paper way too long.