v0.3 Code refactored.