diff --git a/.gitignore b/.gitignore
index 4ac47683..e15324bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,18 +91,18 @@ packrat/*
 !packrat/packrat.opts
 .snakemake/
 
-# exclude data from source control by default
-data/external/*
-!/data/external/.gitkeep
-!/data/external/stachl_application_genre_catalogue.csv
-!/data/external/timesegments*.csv
-!/data/external/wiki_tz.csv
-data/raw/*
-!/data/raw/.gitkeep
-data/interim/*
-!/data/interim/.gitkeep
-data/processed/*
-!/data/processed/.gitkeep
+# exclude data from source control by default -- temporarly added for working on PC and laptop (primoz)
+# data/external/*
+# !/data/external/.gitkeep
+# !/data/external/stachl_application_genre_catalogue.csv
+# !/data/external/timesegments*.csv
+# !/data/external/wiki_tz.csv
+# data/raw/*
+# !/data/raw/.gitkeep
+# data/interim/*
+# !/data/interim/.gitkeep
+# data/processed/*
+# !/data/processed/.gitkeep
 reports/
 .Rproj.user
 *.Rproj
diff --git a/config.yaml b/config.yaml
index 4b277ac5..d82b2f8e 100644
--- a/config.yaml
+++ b/config.yaml
@@ -477,7 +477,7 @@ EMPATICA_ACCELEROMETER:
   CONTAINER: ACC
   PROVIDERS:
     DBDP:
-      COMPUTE: False
+      COMPUTE: True
       FEATURES: ["maxmagnitude", "minmagnitude", "avgmagnitude", "medianmagnitude", "stdmagnitude"]
       SRC_SCRIPT: src/features/empatica_accelerometer/dbdp/main.py
 
@@ -486,7 +486,7 @@ EMPATICA_HEARTRATE:
   CONTAINER: HR
   PROVIDERS:
     DBDP:
-      COMPUTE: False
+      COMPUTE: True
       FEATURES: ["maxhr", "minhr", "avghr", "medianhr", "modehr", "stdhr", "diffmaxmodehr", "diffminmodehr", "entropyhr"]
       SRC_SCRIPT: src/features/empatica_heartrate/dbdp/main.py
 
@@ -495,7 +495,7 @@ EMPATICA_TEMPERATURE:
   CONTAINER: TEMP
   PROVIDERS:
     DBDP:
-      COMPUTE: False
+      COMPUTE: True
       FEATURES: ["maxtemp", "mintemp", "avgtemp", "mediantemp", "modetemp", "stdtemp", "diffmaxmodetemp", "diffminmodetemp", "entropytemp"]
       SRC_SCRIPT: src/features/empatica_temperature/dbdp/main.py
 
@@ -504,7 +504,7 @@ EMPATICA_ELECTRODERMAL_ACTIVITY:
   CONTAINER: EDA
   PROVIDERS:
     DBDP:
-      COMPUTE: False
+      COMPUTE: True
       FEATURES: ["maxeda", "mineda", "avgeda", "medianeda", "modeeda", "stdeda", "diffmaxmodeeda", "diffminmodeeda", "entropyeda"]
       SRC_SCRIPT: src/features/empatica_electrodermal_activity/dbdp/main.py
 
@@ -513,7 +513,7 @@ EMPATICA_BLOOD_VOLUME_PULSE:
   CONTAINER: BVP
   PROVIDERS:
     DBDP:
-      COMPUTE: False
+      COMPUTE: True
       FEATURES: ["maxbvp", "minbvp", "avgbvp", "medianbvp", "modebvp", "stdbvp", "diffmaxmodebvp", "diffminmodebvp", "entropybvp"]
       SRC_SCRIPT: src/features/empatica_blood_volume_pulse/dbdp/main.py
 
@@ -522,7 +522,7 @@ EMPATICA_INTER_BEAT_INTERVAL:
   CONTAINER: IBI
   PROVIDERS:
     DBDP:
-      COMPUTE: False
+      COMPUTE: True
       FEATURES: ["maxibi", "minibi", "avgibi", "medianibi", "modeibi", "stdibi", "diffmaxmodeibi", "diffminmodeibi", "entropyibi"]
       SRC_SCRIPT: src/features/empatica_inter_beat_interval/dbdp/main.py
 
diff --git a/data/external/aware_csv/calls.csv b/data/external/aware_csv/calls.csv
new file mode 100644
index 00000000..530f275a
--- /dev/null
+++ b/data/external/aware_csv/calls.csv
@@ -0,0 +1,9 @@
+"_id","timestamp","device_id","call_type","call_duration","trace"
+1,1587663260695,"a748ee1a-1d0b-4ae9-9074-279a2b6ba524",2,14,"d5e84f8af01b2728021d4f43f53a163c0c90000c"
+2,1587739118007,"a748ee1a-1d0b-4ae9-9074-279a2b6ba524",3,0,"47c125dc7bd163b8612cdea13724a814917b6e93"
+5,1587746544891,"a748ee1a-1d0b-4ae9-9074-279a2b6ba524",2,95,"9cc793ffd6e88b1d850ce540b5d7e000ef5650d4"
+6,1587911379859,"a748ee1a-1d0b-4ae9-9074-279a2b6ba524",2,63,"51fb9344e988049a3fec774c7ca622358bf80264"
+7,1587992647361,"a748ee1a-1d0b-4ae9-9074-279a2b6ba524",3,0,"2a862a7730cfdfaf103a9487afe3e02935fd6e02"
+8,1588020039448,"a748ee1a-1d0b-4ae9-9074-279a2b6ba524",1,11,"a2c53f6a086d98622c06107780980cf1bb4e37bd"
+11,1588176189024,"a748ee1a-1d0b-4ae9-9074-279a2b6ba524",2,65,"56589df8c830c70e330b644921ed38e08d8fd1f3"
+12,1588197745079,"a748ee1a-1d0b-4ae9-9074-279a2b6ba524",3,0,"cab458018a8ed3b626515e794c70b6f415318adc"
diff --git a/data/external/empatica/empatica1/E4 Data.zip b/data/external/empatica/empatica1/E4 Data.zip
new file mode 100644
index 00000000..40691f5f
Binary files /dev/null and b/data/external/empatica/empatica1/E4 Data.zip differ
diff --git a/data/external/participant_files/p01.yaml b/data/external/participant_files/p01.yaml
new file mode 100644
index 00000000..90f48512
--- /dev/null
+++ b/data/external/participant_files/p01.yaml
@@ -0,0 +1,11 @@
+PHONE:
+    DEVICE_IDS: [a748ee1a-1d0b-4ae9-9074-279a2b6ba524] # the participant's AWARE device id
+    PLATFORMS: [android] # or ios
+    LABEL: MyTestP01 # any string
+    START_DATE: 2020-01-01 # this can also be empty
+    END_DATE: 2021-01-01 # this can also be empty
+EMPATICA:
+  DEVICE_IDS: [empatica1]
+  LABEL: test01
+  START_DATE: 
+  END_DATE: