#50 reduced warnings to 2,029