last changes from nick

last changes from nick