Retesting with new folder system.