Changed to constants back