6.1 and 6.2 finished