Adjust loop and added new files