edited for ops new