this is really the third commit

final commit to merge
merged