Progress Report 2 merge