some changes in data source and domqin\controller