last changes to prog assign 2