Grid vs Grid maybe fixed? + minimal changes (not sure about offsets in colliding masks but I'll let it slide for now)