Modified for folders and ip