forgot binary ...
refactoring
improvement and patches