Change the design and fixed the objectives