New code with no pedantic errors