Todo: Fix discrepancy between push and pull for o.