More changes towards working multi-source.