These are the final updated files with corrected errors