refactoring code.. and v0.3