Updated and completedated and completed version