Fixed for modified tutorial data structure