Version 3.0

Update for Version 3.0