Small rewrite and bumped version