merge with ness01/trigsimp