modified version 1.1
merged branch1
final product