Fixed the model and did more work on the random structure