Update

Fixed 3.0 Bugs