Worked on some additional folder selection