added navarro 1985 optical model