Nearly final updated