Redid some of the code, worked on Model 10