rearrange & add push script