Rewrite code
Changes