1-2 updated