Merged changes to mansuscript