Adding files, updates and 3_5