Simplified code (no need for the folder helper)