code changes from work done in Ops Summer Project