new v2
removed fluff
less fluff even
more cleaning up