updated to take new files into consideration