last changes to prog assig 2