Added raw setup