updated 2 and 3