More code rewrite.