Modified two files for public consumption