after merge + minor corrections