edited all files for more user interaction