golfing
my solutions and an upgrade to 2.0.0