Tweak some numbers to account for larger grid size