Merged in mike's changes.