unstack and stack updated