modified code so there were less make errors