Corrected files from prior commit