last changes provided by Sergi