Added wildcarding and saving location