Revert "using a pointer instead this time"

This reverts commit 98b967b0e2040c1e32b8fc4d8f68ef6ac52ed6a5.