compiles now, had to move some constant