Added Update method and rectified some issues.