added missing changes to last commit