Commit v0.0.0_02 Changes