Adding more files and screens