Const rework finished