altered and added datasource placement