+ rewrite/rename of lots of functions