Joshes changes

These are the changes I made in class