Refactoring + binary with demo