merged pt. 2