Updated Mission2 mostly