Merge to update to Adams branch