Merging Rick Gerkin's changes into a branch for testing