remove debugger
 move constant
update