1.5 & 1.6 finished