working on model bugs