Updated setting up section