changed models n stuff