Rewrite parts of code, saves locations now.