Final implementation on Folder