Added Reorder's modifications