arpol consolidated edit

arpol consolidated edit