Rewrite for simplification
Bump version#