Added constants, tuning.