sync'ed with new c41/cli interface