1.2, finish issue 3 and 4