Corrections from Katya
Some corections for Mailr draft