Const values adjusted