Update after code review. Ready to merge.