Changes made by Sonia for fixes