Added Main and Warp initial structure