merging changes made by "Aldus"