Change constants to Avi's