updating models and restructuring.