Rearranged the appendix and set new geometry