added to the manifest
merged changes