Derek M - 2006-03-06

Corrected switches