Version 2.0

Updates with 2.0 code