addapt to crossdata chnages