Rebuilding the model so maybe it will work