Adding in some early changes