Now as singleton. Other changes.