modified models to function properly