Short commit - removed hard-coded debug values.