refactoring and update to 0.0.6