Added updates based on the Mesiner e-mails (version 5.8)