changed to regular array
move constants