Mike

Merged Pat's commits