data source swap
reoved fluff