version-3

Changes and updates