Added last changes
Latest changes fixing merge