Completed new set up structure