#50 reduced warnings to 598