Implemented Re-order assignment on unit setup.