Initial Update and Test