Finished p18 and p67 (the latter is a slight variant of the former)