Merged with changes from Author