merged #2