Changes in accordance to Betina's 1st review