Revert "Grab adjustments"

This reverts commit ea0378e11fee9d46f0c0a9db88e75b9f86e8076e.
Reverted Grab adjustments

Undid my last commit and did it in a different branch, instead.