Some more additions after looking at a diff of the folders