Modified grid model
Changed some void to task