Pull request for changes 11/23