Updated with last changes