last changes for #20