Completed version