Merged 11/9 work