adapted model
adapted other stuff