@solidgoldbomb won't like this change.  why no more const?