Updated vectorised FVM for general application