last changes from build 11