Final Updates

Completed Version