Changes from ribot jasonfry tools