merging with ace.tern