Add proper binary operator
Update comments