Changed some x's to y's for consistency.  Not sure why I did that.