Re-arranged a bit