Improved the folder