Updated final work

More stuff