chnages for swap hint compatibility