changes done by Maria