Updated implementation of vectorisation of FVM (partially tested)