updates 1 and 2