reorder and revalue the local selector to be easier to read