rework - v0.2

new  version (global changes)