local version #5
merge version #7
final merge