Version 3.0 based on trial data and up-to-date literature

Summary
Version 3.0 based on trial data and up-to-date literature