updated to crossdata changes 29/12/2014