Changed to public files
Merged changes