Reorder code II