Few name changes, some more variables, especially in model again.