Some Changes to start development