Same comment as above and perhaps some other parts of the code, later in this PR