A try on fixing take

specifically worked on the qSetup method, among other things
Revert "A try on fixing take"

This reverts commit 08ce695f925a132f7e3061fa4d70be78c39bff4c.