Fixed changes from Naomi