Re-arrange system.prop