v1.0.5 small refactor