Version 1.0.0 rewrite