changed models
cleanup
last 10 minutes working