Update #10

Allot of changes