Finished set_sub() and second pass