Did more work on operators