Further Code Correction