updated models and methods