Issue #13: Added end location for HV and NW, OV not yet.