New version

changes reflects the changes in API