Merge back first quarter's updates