Added swp and ds_store