finish work on paste-with-imports