Changed peter values. Fixed debug.
Merge..?