added wt1600 and other stuff