refactored
0.0.2