stable Version after Merging