rewrite for domo 1.0