Applying changes from Chuck's previous commits. f40180444adcb7735db664d8a35c25355c360a8e