Fix binary
Add calculator