modify 1 and 2