Changed scan to always pass the folder argument. This is in line