Added the last changes