core models fixed