Updated binary and TODO