post update
rearrange stuff