merged #3