working on fixing multiple sources