made lots of changes to enable shots in multiple directories