merge with uh-adapsys