updated model and module