PC reorder

Reorder some of the functions