Re-arranged a couple sections