Removed a random file and added some extra queries