updated for const fixes