Updated 1 and 2