finish 1.9 and 3.3