Update nearly working