updated operators
merged