Update with Bugs

Create Class