updated setup procedure