merged from hj