*changed how the datasources get set