Update Setup

rearrange