updated models and spider