finish fixing const problem