adding hastie figure + some other changes
fixing merge conflict