Changes for scalability
Change settings