last changes for it to work live