Move finish_fast to matrix section