added shaw stuff