Added the intial setup