Use safe methods, which somehow speed up grid advancing by ~10%

Use safe methods, which somehow speed up grid advancing by ~10% #36