-impl features [#4, #5]
-polish