updated changes from portfolio1