merge latest from tom's repo