Merge for progress report 2