added swri stuff