- Corrections according to Freddy's email