accepted all changes from Nelson + new references