Logic fix
Even better threading
Better grid