Edited files for mainstream use