Sorry rolled back commit

These are the updated files, but comment on other commit need to be
addressed