Merged Famous changes and made some modifications to files