new changes
little changes
resolved merging issues
final commit