new sources almost done