Merged mine and Rowdy's changes.