Temporary changes for hvzplanner