updated lines from new_feature branch1
merged