apply modifications on ovp_service.py