adding updates from Sergey