Backup of working implementation of vectorisation updates