Adjustments: Swap org and title. Add address